bitkeeper revision 1.1568 (42960d67jYin00CdEGWDPCLZ5h6Hnw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 26 May 2005 17:54:47 +0000 (17:54 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 26 May 2005 17:54:47 +0000 (17:54 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk


Trivial merge